From: Kim F. Storm <storm@cua.dk>
Date: Wed, 21 Jul 2004 21:07:59 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~21581
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=df1f6551c64c116d8a9053f6ab8f33af4f7ab10b;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 998c640a9b8..b0061aa83a0 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2004-07-21  Kim F. Storm  <storm@cua.dk>
+
+	* window.h (struct glyph_matrix): New members nrows_scale_factor
+	and ncols_scale_factor.
+
+	* window.c (make_window): Initialize nrows_scale_factor and
+	ncols_scale_factor members.
+
+	* dispnew.c (margin_glyphs_to_reserve): Apply ncols_scale_factor.
+	(allocate_matrices_for_frame_redisplay): Fix left/right margin mix-up.
+	(required_matrix_height): Apply nrows_scale_factor.
+	(required_matrix_width): Apply ncols_scale_factor.
+
+	* xdisp.c (display_line): Increment nrows_scale_factor and set
+	fonts_changed_p if past last allocated row.
+	(append_glyph, append_composite_glyph, produce_image_glyph)
+	(append_stretch_glyph): Increment ncols_scale_factor and set
+	fonts_changed_p if current area is full.
+
 2004-07-21  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
 	* widget.c (EmacsFrameDestroy): Don't abort if normal_gc is 0.